Fixing ComposableIndexTemplateTests #130052
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
masseyke
added
>test
elasticsearchmachine
added
the
Team:Data Management
Collaborator
|
Pinging @elastic/es-data-management (Team:Data Management) |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR updates the testMergeEmptyMappingsIntoTemplateWithNonEmptySettings to handle cases where the existing template or its mappings are null, and re-enables the test in muted-tests.yml now that it passes.
- Adjusted the test to assert the new
EMPTY_MAPPINGSbehavior whentemplate()ortemplate().mappings()is null. - Restored the test in
muted-tests.ymlby removing its muted entries.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java | Added conditional assertions for the null-template or null-mappings scenarios in mergeMappings. |
| muted-tests.yml | Removed the muted entry to unmute testMergeEmptyMappingsIntoTemplateWithNonEmptySettings. |
Comments suppressed due to low confidence (1)
server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java:351
- [nitpick] Consider splitting this randomized test into two separate, deterministic test methods—one covering the null-template/null-mappings path and another covering the non-null path—to make failures easier to diagnose and ensure clear coverage.
public void testMergeEmptyMappingsIntoTemplateWithNonEmptySettings() throws IOException {
server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java
Outdated
Show resolved
Hide resolved
lukewhiting
approved these changes
Jun 26, 2025
Contributor
lukewhiting
left a comment
lukewhiting
left a comment
There was a problem hiding this comment.
Bar copilot's comment, LGTM 👍🏻
Contributor
|
Don't forget to close #130050 when you merge. |
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ComposableIndexTemplateTests::testMergeEmptyMappingsIntoTemplateWithNonEmptySettings fails when indexTemplate.template() is null or indexTemplate.template().mappings() is null, because ComposableIndexTemplate::mergeMappings intentionally sets the mapping to EMPTY_MAPPING if you pass in EMPTY_MAPPING when the template or the template mappings are null. This fixes the test to account for that.
This was introduced by #129787.
Closes #130050